Merge "Keymaster: Fix potential bug in extractUint32()/extractUint64()" into rvc-dev