[automerger skipped] Merge "Fixed encoding of device_locked field" am:...
[automerger skipped] Merge "Fixed encoding of device_locked field" am: 360567ba am: c8936854 -s ours
am skip reason: Change-Id I3c5352523b2db37d539ad353ac8c48c1585eb08d with SHA-1 664ff765 is in history
Change-Id: I4038f875f8c5cb73ca822be9b65bc3840dfe0223