am a1cf4f31: am 109d59bf: Cherry pick r96826.

* commit 'a1cf4f31e8e5794ff752ef9f72691ecf001abcf1':
  Cherry pick r96826.