am 17f1ff8c: do not merge bug 3370834 Cherrypick from master CL 79894

* commit '17f1ff8c99dada2cca93f68d434cf64a6dc692c2':
  do not merge bug 3370834 Cherrypick from master CL 79894