This reverts commit59f532efad. Bug: 137819199 Test: manual Change-Id: If5e8856aad74b6f232fff9d5fd746f56d63288eb Merged-In: If5e8856aad74b6f232fff9d5fd746f56d63288eb (cherry picked from commitc499ad3775)
This reverts commit59f532efad. Bug: 137819199 Test: manual Change-Id: If5e8856aad74b6f232fff9d5fd746f56d63288eb Merged-In: If5e8856aad74b6f232fff9d5fd746f56d63288eb (cherry picked from commitc499ad3775)