This reverts commit 1b3bfb2624. Bug: 22589743 Bug: 22121742 Change-Id: I7b482ffb8a0ee174ddc804aa890de45bdbd758e3
1b3bfb2624