Merge "Lock access to managed services." into oc-dev am: 8ac1452288
am: 7e0a00e387

Change-Id: Ibe3e760716ff2ccfbb1432bbe431de33348d8cb0