This reverts commit 49e179cb. Reason for revert: b/193206356 Bug: 193206356 Change-Id: I8020f0292c1a867ad53278f73296ac2aaef974bd