am 172c8f71: Merge "Avoid unexpected conversions to ArrayRef."

* commit '172c8f71a866931728c389a46ae9e69bc4c04a13':
  Avoid unexpected conversions to ArrayRef.