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

Change-Id: I202c3dcf38f42b94952e86bca48ccf0aa4edd038