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

Change-Id: Ic42378328e1c66cb9bfe254e409457084c779055