This reverts commit 644a0f82cc. Reason for revert: Roll forward with fix Change-Id: Ibc51ddd7befce0163e10aa874711a9c873b34b9f
644a0f82cc