Set text in layout rather than programmatically
am: 0447c75954

Change-Id: I3c3266118d26091c1bc64a450334b7964f88f9f8