Merge "Telephony mainline updates." am: fc9898a871
am: 111ac57ccb

Change-Id: Iaa4830195dd8c13a0ac450036ed6c05385933d1b