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

* commit '393c7fb2c67e7fc9dfab710a52313f9b55aaa57c':
  Default grants: handle update system packages