Merge "Changed RP logs to only error when RKP only"