am 6c465bbe: (-s ours) Cherry-pick f1dee1 from master for SDK. do not merge.

* commit '6c465bbe805354dc0101d2cac1d7ce374bb336a0':
  Cherry-pick f1dee1 from master for SDK. do not merge.