Sync master templates with upstream branch, retain annotation customization from master.

Change-Id: Ie1119bc1b18a017e1bef199949801fb045d8ff06
8 files changed