See https://android-git.corp.google.com/g/156801 Bug: 5449033 Change-Id: I3b4ea2184555bc0b570ec858601d4c43ecffb6f8