Merge changes from topic "sample_template_update" into pi-dev am: 430f5c03d1
am: b07dff3b0b

Change-Id: I243edd86746ecab3815f78fe1557e00da602f70a