Merge "Make RRO defaults forward compatible"