Fold wikiquote rewrites into one.

Change-Id: I41cadfb4a8746f6745c024c7debd86b05199c7e6