This reverts commit 58713d2b16. Bug: T145228 Change-Id: Ic62f19109f98fab9dd029acccecd6518b649e34b
58713d2b16