Merge "Merge "Do not update packages in encrypted state" into nyc-dev am: c4f1bc4032 am: 7397e80504" into nyc-mr1-dev-plus-aosp