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

Change-Id: I171b902930d97efafac06b124da6bbe52ee815dc