Merge "Adds text to template xml and screenshots. am: 5953554d am: 3445e237 am: 1467298c" into nyc-mr2-dev-plus-aosp