am f1d9400e: (-s ours) am cfcac8c2: am 2f011b0f: Merge "Fix a broken test due to RS header file updates."

* commit 'f1d9400e270b4117761c71526ed539796316d73a':