Merge "More telephony updates for mainline." am: 5be8504888
am: 0f0dfaca35

Change-Id: I77fdb0953ef799cbd44db16b797fef7386a71cd7