Merge "Remove "DBG" tags for Call Forwarding UX." into oc-mr1-dev