am 57b5f249: Merge "Check permissions before using associated APIs" into mnc-dev

* commit '57b5f249a4faf184298cd05fc2c3c17c3f5751b0':
  Check permissions before using associated APIs