DO NOT MERGE ANYWHERE: Release mPackages lock earlier am: bab7c28e5e  -s ours
am: 655932af79  -s ours

Change-Id: If5e283f29ca14e7eb7d2dbf7edefe3f5a2be4223