https://android-git.corp.google.com/g/#change,87425 ) Change-Id: Ibc0f12defaa5d90894657ce63fb352578eca7060