Fixes strings

Bug: 119835271
Bug: 119835278
Bug: 119835773
Test: visual
Change-Id: Ifb860cfac3354d0a64d856c003fc33d112f2d0f8
2 files changed