am 7fac96a0: am 89536903: Merge "StandardNames: update RI expectations"

* commit '7fac96a0649136b2017e2e6764806f0b2510add6':
  StandardNames: update RI expectations