Merge "Migrate telephony code away from Time" am: b8bdc72174 am: ae2f34462a am: f28ebce301
am: 0bda573440

Change-Id: I0869343320806ef84c6886933f936e70b53134a5