Merge "Fix some obvious typos and copy-paste bugs."