am 0c0221b: Merge change 972 into donut

Merge commit '0c0221b86b518630f8210060438bc31433e175f9'

* commit '0c0221b86b518630f8210060438bc31433e175f9':
  Back-merge all changes done in master to DumpRenderTree to donut.