Merge "Change a test to not reference sharedUserLabel anymore (blocking string import)"