Merge "Fix NPE in Call Forwarding Menu" am: ee39e6e007 am: aa84d8298a
am: 4f7dfbb2db

Change-Id: I8cad3504c036242bdee846fb2c6071bb2e46949c