fix distro_tag_map race condition when importing distros

Bug: 874386
Change-Id: I4c6bdaa28e0f30f42c81a36ce08ba1a62b461ab5
Merge "fix distro_tag_map race condition when importing distros" into develop