This reverts commit ceef7461. Reason for revert: b/132986140 Bug: 132986140 Bug: 131915789 Change-Id: I95b28fb4d5eca1927be213e070177f8f3626d9b7