am 99647fb: Pull the useful part of p9-132414 over to "donut".

Merge commit '99647fbab2aee5730d277ddb2247709ccd4c95fa'

* commit '99647fbab2aee5730d277ddb2247709ccd4c95fa':
  Pull the useful part of p9-132414 over to "donut".