Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into nyc-mr2-dev

* changes:
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaf am: c056ac30 am: 782fc16d am: aaa67659
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaf am: c056ac30 am: 782fc16d
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaf am: c056ac30
  [automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: c624deaf
  DO NOT MERGE Disable changing lock when device is not provisioned.