This reverts commit 28d26a821f. Bug: 36027947 Change-Id: I3d4c2e58b753120ff668a4594f60692abc6a3426
28d26a821f