Merge "Release mPackages lock earlier" into nyc-mr1-dev am: 42b14329f5
am: d8f1599a6a

Change-Id: I9258c68915922344d5067ca1131441d19511c51a