Merge "Use synchronization when accessing mPackages state" into oc-mr1-dev