Merge "Detect invalid Call Forwarding numbers and replace" into oc-mr1-dev
am: 112e5ada3c

Change-Id: I029ddd57bfd0469a87911957f3a1082a1918e997