Merge "Add null check for label when persisting provider info" into tm-dev