Merge "Only require RKP on T+ chipsets" into main