Fix leftover user_text occurrences

Change-Id: I98452a0675e4605f87fdab9eef24f2785943326f
(cherry picked from commit 4f40172a5442c01ff362d9c92424c956bf338f2d)