Set text in layout rather than programmatically am: 0447c75954
am: ec2cd1fe42

Change-Id: I92a837602f991b3215960ccdc7ba833dc0de6937