am 6bc5b226: am c5a759cf: am d8c2bbcf: am 10c111ed: Merge "Show basic feature warning for default granted permissions" into mnc-dev

* commit '6bc5b22630e7e9aa08f2f65a0452857ff3739c57':
  Show basic feature warning for default granted permissions