Merge "Error reporting when registering cm handle with alternate id 2 - update scenario"