Merge "Telephony mainline updates."
am: fc9898a871

Change-Id: I3a5d5bcb889df7db253351528ed9a1d0fe326f5b