Merge "keymaster: Relax testing under GSI" into qt-dev