Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev