Merge "Docs/API fixes for API review" into nyc-dev
am: ffa1650ba0

* commit 'ffa1650ba0b60f9802360aa8491089c2432270e5':
  Docs/API fixes for API review

Change-Id: I49dfa2a577f16eba2a2cc2015da50a086c56ad91