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

Change-Id: Ib48a8cd48058e28b8acabc99e7a08f2a39e297de