Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into oc-dev
* changes:
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f am: d98908e7c7 skipped: 3503445e59
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f am: d98908e7c7
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f
DO NOT MERGE Disable changing lock when device is not provisioned.