This reverts commit 2c15b583. Bug: 36130225 Bug: 67670457 Merged-In: Ibaccd96e730aa3b1d2061c991bb3c8946ba25a95