Merge "Add metric when cloud provider changed by user" into tm-mainline-prod