am 775f1d40: Merge "Follow-up 128393"

* commit '775f1d4096efce112a3bd1e5897c84f898c5f7ce':
  Follow-up 128393