am 58af51a1: am 763e62a8: Fix a case introduced by https://android-git.corp.google.com/g/#change,47640

Merge commit '58af51a1f2afc20ac1f1465b13c300754358be6c' into kraken

* commit '58af51a1f2afc20ac1f1465b13c300754358be6c':
  Fix a case introduced by https://android-git.corp.google.com/g/#change,47640