Merge "Handle un-handled supplementary service failures." into oc-dr1-dev