am 67020954: am a4611ac0: DO NOT MERGE: cherrypick from master to fix b/13289050

* commit '670209545cbf585165029d8866972ade111785c5':
  DO NOT MERGE: cherrypick from master to fix b/13289050