Merge "Fix telephony build" am: 542b99d8ac
am: 4900fcbd93

Change-Id: I9f706c303b0c27e3cdfe4788de248339e6227e83