Merge "Two REMOVE_PROVIDER messages caused by race condition."