Summary: After mechanically merging changes, some by-hand adjustments are needed.
Reviewed-by: ysr