This reverts commit 4d6b1a95a1. Bug: 110279118 Change-Id: I794b2c7af076d63901f2286fd2ff3d06c6e39fee
4d6b1a95a1