am 268b9d07: Merge "Don\'t cache results of permission check" into mnc-dev

* commit '268b9d07ed66cb6024838355a8e1156728cbba50':
  Don't cache results of permission check