This reverts commit 0fbdbc2c41. Bug: T203750 Change-Id: I1bca27b2087f6fc1bfad153f17f4650c52786a7f
0fbdbc2c41