Merge "Respect users choice if they clear cloud providers" into tm-mainline-prod