Bug: 36453077 Test: make Change-Id: Ic77394d4d2e1ccedba3a28230d870c5d6108bd40
Test: Basic telephony sanity Bug: 32020264 Bug: 34344851 Merged-in: I8908ce0c6b380c8f4260703fa43125dc03d24dbc Change-Id: I8908ce0c6b380c8f4260703fa43125dc03d24dbc