Merge "Add template description, screenshots, etc. for sample. am: 967e6525 am: 8e977135 am: b9889d06" into nyc-mr2-dev-plus-aosp