track cm opt_telephony branch

Change-Id: I4a6ad90e970f375346fab7d992a00f3b5286a00c
Signed-off-by: scott <scott@ubuntu.com>