This reverts commit 141255f30c. Reason for revert: Attempt re-submit again Change-Id: I0e568fdf8f7a141ee3c5d54f68530ff478a47439
141255f30c