This reverts commit ad4883bb. Reason for revert: b/111218263 Bug: 28536972 Bug: 32613009 Bug: 29150779 Change-Id: Idc1621d472d742929f56d10d72b077b774b9e56e