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