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

Change-Id: I7611b5a5eff93df9e6780a6ad2c8cc7a9ac986e3