Merge "Fix some typos and logging of calls to CDMA methods."