Merge "DO NOT MERGE ANYWHERE: Release mPackages lock earlier am: bab7c28e5e  -s ours am: 655932af79  -s ours" into cw-f-dev
am: dbb5845378  -s ours

Change-Id: I247bf8ea05320da5fed80f3214023c5415d1b639