am 5e5632ff: Merge "Fix RI testing."

* commit '5e5632ff1651adbf95faaf8fb3239a36f9f61124':
  Fix RI testing.