Merge "Fix two multi-user bugs in package upgrade." into nyc-dev
am: fc5f6e6

* commit 'fc5f6e6c80954c837a98d963789f6a30f3b87ad1':
  Fix two multi-user bugs in package upgrade.

Change-Id: I395320fa5b22daa6d63d8f89e5fcc53d252ade21