Merge "Fixed encoding of device_locked field" into rvc-dev am: c3939fc3d2 am: 519fc638e4 am: 1a87369861

Change-Id: I0650b8a88981dad0621a4e0aa26ff6a1c4ff765f