am 92cb006c: am a4375293: am 393c7fb2: Merge "Default grants: handle update system packages" into mnc-dev

* commit '92cb006c374aa4d6159ebba39cbb9ee9eb8b9d70':
  Default grants: handle update system packages