am 2f011b0f: Merge "Fix a broken test due to RS header file updates."

* commit '2f011b0fd96c053f98590344cc3b93543ddd8a08':
  Fix a broken test due to RS header file updates.