Merge "Remove "DBG" tags for Call Forwarding UX." into oc-mr1-dev
am: 1d6e2afec6

Change-Id: I823eb735993cef1eec335c04589b3228c9a3ee60