Merge "Release mPackages lock earlier am: 94f9be2ee2 am: 2ee7053cfc" into nyc-dev-plus-aosp