Improve strings

Change-Id: Ia210ee0fb04214325d26abaefed188d956e96c91
(cherry picked from commit e5ba2662feff819764e587ccc4eb88087a98fd38)