This reverts commit 836c7089. Reason for revert: 157863128 Bug: 157863128 Change-Id: I0ec7878c839b397252c975475b4c3a4ff144082e