Merge "Don't over-acquire NPMS locks." into oc-mr1-dev am: 4576171c33
am: ad8690266e

Change-Id: I4a975059ceb64dd6ce143645c00a314a2041ad2c