Merge "Fix pair of typos"