See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
Change-Id: Iacda2386342ba0727bbf278f6c597488d5467bb8