Cherry picked from a revert in https://android-git.corp.google.com/g/#change,82252 Change-Id: I141bbff2a0f9a8ab40f10c59fc1280b94b38e4b6
Cherry picked from a revert in https://android-git.corp.google.com/g/#change,82252 Change-Id: I141bbff2a0f9a8ab40f10c59fc1280b94b38e4b6