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

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