Merge "Move some of the call-forwarding related constants"