This reverts commit af1eda2654. Bug: 112064298 Change-Id: Ie7912c055e8e27250b0404e337813c0ee670b1de
af1eda2654