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

Change-Id: Iea1104733af8cb5c779c6d6c690d8322fa26e462