Introduced by: https://android-git.corp.google.com/g/71675 Change-Id: I37722a8cc6bd247fe45651c2b680c2f399ccc5ac