am a4a031db: am abf3c085: am ebbb11d5: am 9fbba1f7: (-s ours) Merge "Update the print sample/test code." into klp-dev

* commit 'a4a031dbd45295dc5ef97df922a62d6a9d3e32b7':