Fixes screenshoots and adds proper meta data for descriptions, etc. in the...
Fixes screenshoots and adds proper meta data for descriptions, etc. in the read me file produced by the template. am: 4ce6d747 am: 74a7e869
am: 0e609f8e
Change-Id: Ied67ae1c61c584ec2473f6a4a1f42632b03aa683