Merge "new telephony annotation class" am: 9e2e989423
am: 2344dd0745

Change-Id: I1127350caf12f837984797cd202b0d615d992623