Merge changes from topic "jan7"

* changes:
  Respond to API council feedback.
  Final push to build against SDK.