am 0ed62962: am edc31579: Merge "More API review feedback" into mnc-dev

* commit '0ed62962d968877f26fe0ca760e37e0a4156e248':
  More API review feedback