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

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