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

Change-Id: I4254d0829738ccd9f21d835a647841bc735b3600