Merge "Do not update packages in encrypted state" into nyc-dev am: c4f1bc4032
am: a5e81480b1

* commit 'a5e81480b16e8cbf5a3c4f015b667893defb1456':
  Do not update packages in encrypted state

Change-Id: I6307cc4b29146dc95f3b5b45f22270fc44d6d2b7