This reverts commit 76f8d668. Reason for revert: b/185150865 Bug: b/185150865 Change-Id: If314a341779c004bbbb8a5b525a93eb10a9e2651