This reverts commit 05597c0c. Bug: 171506470 Test: Build Change-Id: Id45b2eec2c9c1ba1a33ba35232229004d67c026c