[automerger skipped] DO NOT MERGE Disable changing lock when device is not...
[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped: 94ea2dad am: 3672a1fe am: cff52001
am: 0f014721 -s ours
Change-Id: I65bcaaf997de93f005d331a1df0e396792906ff0