Merge "Ensure that "rkp only" forces checks for rkp keys"