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