This reverts commit a9578a2b8a. Test: Build Bug: 80007047 Merged-In: Id5f01e5de94ffaa86de1e96f6bde1092b0c586a2
a9578a2b8a