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

Change-Id: Ia0f82fe9eaedc174bc52dfc2b6af0d07bcd9f4f2