Merge "telephony annotations part 2" am: 1a9f2d0e78
am: ccf305e76f

Change-Id: Ib08af42a04289f0cf6bc8987341afdfe02c5b7a6