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

Change-Id: I8ff3f7a861aa64812d362b5d507ff88011f9e257