This reverts commit 203ffaa103. Bug: 62234081 Change-Id: I8dd95dba52f268fb57f55e315431cedbc5128adc
203ffaa103
1effe000b8