Merge "Restrict updates of system packages" into nyc-dev
am: 4e4fca43b0

* commit '4e4fca43b0fb1320ce0265640d33b700cd886da8':
  Restrict updates of system packages

Change-Id: Ie6e530365b1b805091f60ca4c5a3a2b1701409ca