am 725f145e: Merge "Address API review comments" into mnc-dev

* commit '725f145e0ffe18b2c81dbf07c8cb7633ab99b682':
  Address API review comments