Merge "Release mPackages lock earlier am: 94f9be2e am: 2ee7053c am: 893fbf87" into nyc-mr1-dev-plus-aosp