Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into nyc-mr2-dev
* changes:
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e8 am: d98908e7
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e8
DO NOT MERGE Disable changing lock when device is not provisioned.