am 1de571fd: am b0b4bcfc: DO NOT MERGE.  Only impacts SDK.  Integrate from master.

* commit '1de571fdd3e56aa1912458f610882ee0f9cf138b':
  DO NOT MERGE.  Only impacts SDK.  Integrate from master.