bug:18415632 Clean up some text, and add a sample. Change-Id: I39fdda2004e1932831058701f95f67355786ad9d