Merge "new telephony annotation class" am: 386027afdd
am: 54aba99636

Change-Id: I558883c7fb94b9685da5f5c570d2d331a19ba6d5