Teeui layout and rendering am: 5821a43f98 am: 55cbd780bd am: 8e7639b980

Change-Id: If506b63e0e9addbed41f464c221adaaa2f5d086e