am 4dc72d6b: am 1f56ae67: Merge "Cherry-pick b949d02b3dab63d3f2c2d28ab28a8b80b6dc4724"

* commit '4dc72d6ba9bce20e39b1421695bb00365a7d2705':
  Cherry-pick b949d02b3dab63d3f2c2d28ab28a8b80b6dc4724