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

* commit 'f89f84bddcd319c5b802e3b4fb886db8caf9c0d0':
  Check permissions before using associated APIs