Merge "Fix some typos and other cosmetic cleanups in telephony framework."