Merge "Fixed encoding of device_locked field" into rvc-dev