Merge "Release mPackages lock earlier am: 94f9be2e am: 2ee7053c" into nyc-dev-plus-aosp am: c4f7166e am: 4045f690 Change-Id: I270decaa25fa0af92c7092d077ce5082e981e2b0