Merge branch 'stage-telephony-refactor' into master

Bug: 33644781
Change-Id: If571e3ad9432035811714e3a92d9dfff39311c61
26 files changed