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

Change-Id: Ie77716fe87a9311e2ea9e5864c5a8ee3194087b1