Merge "Fix a broken test due to RS header file updates."