[automerger skipped] Merge "telephony annotations part 2" am: 1a9f2d0e78 am: ccf305e76f
am: 8782bfab97 -s ours
am skip reason: change_id I6de632ef7ef01a939971b7d1bacb227ec5ff4048 with SHA1 f85cf993d3 is in history

Change-Id: Iebc58a12f279068c7bfb257350fe8b81d938ca11