Merge "Disable changing lock when device is not provisioned." into oc-mr1-dev