This reverts commit 12025857. Bug: 37480230 Bug: 37355569 Change-Id: I315b8c18a79d0dcd6be84c3d2af120b073144a9e