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

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