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

* commit 'bb307c00ab8fd9dc2a0c96bc7c3bfa203f0277a2':
  More API review feedback