This reverts commits 01a017a1 and 1025a592. Bug: 72131483 Test: n/a Change-Id: I1aa0e57e979c0a86bdf8691c2b507755f9bf2f8b