Fixes: 155771527 Test: visually tested the string changes. Change-Id: Idcde93e2035bb8d3d82213befb652aa29aa12efe