Merge "Fixed encoding of device_locked field" into rvc-dev am: c3939fc3d2 am: 2640ee504b

Change-Id: I8e0b063835f4d1d83c7b3305b31b37a610943bf2