Merge "telephony annotations part 2"
am: 1a9f2d0e78

Change-Id: I99e956fc3766bbb585c7e7315142ee43de95ce23