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

* commit '10c111ed35a0282ddf5dda540c53e3831bc9b0ec':
  Show basic feature warning for default granted permissions