Fix leftover user_text occurrences

Change-Id: I98452a0675e4605f87fdab9eef24f2785943326f
Merge "Fix leftover user_text occurrences"