Merge "Fix typos in use of %#" into nyc-dev