Merge "Use synchronization when accessing mPackages state" into oc-mr1-dev
am: 9d656d0305

Change-Id: I78cb61a5bc667fe2d902b49e292968941251cdc6