This reverts commit 5b75774004. Bug: 151051671 Test: m Change-Id: I05f0465976098941d47ecc06c978cfa116364d78
5b75774004
805f2492e8
23b4707ddc