This reverts commit 7210b285c2. Reason for revert: attempt re-submit Change-Id: Ia95d11628c512163ae3d13cbdd5ebbe60f435937
7210b285c2