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