am 89536903: Merge "StandardNames: update RI expectations"

* commit '89536903b74478e1462eabc8b43f18ffd8854ffa':
  StandardNames: update RI expectations