am ef010274: am 57a99202: am d247d8b4: am 135e2ce5: am 53c75014: Merge "Add OrSelf to privileged permission check." into mnc-dev

* commit 'ef010274ca16490c6e08edcd1d0a48de0e88097b':
  Add OrSelf to privileged permission check.