[automerger skipped] Fixed encoding of device_locked field am: 76ce61d4ce am: 8d0cddc68b -s ours

am skip reason: Change-Id Ibe78d65719f78a4d64581bdef6988f1dfbd85523 with SHA-1 b0cd8a9496 is in history

Change-Id: I9005dc91c7f233ca225cc6f91dfea29b2afc91bc