Merge "Fix typos/spacing with new APIs."