This reverts commit 1cd027850b. Bug: 9059539 Change-Id: I1880b799e2d0f148ae913f13cffa1b8cac48be60
1cd027850b