am f679ba7d: Cherrypick from GB. Do Not Merge.

* commit 'f679ba7d944a403fbdc77926c44978ffd5161f2d':
  Cherrypick from GB. Do Not Merge.