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