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

Change-Id: I80068a392ffe444c4477c999efd5acebe82d5da8