Merge "Detect invalid Call Forwarding numbers and replace" into oc-mr1-dev