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
Change-Id: I4720d4590c1bba6e7208941f202079b155703cf7