tree c8cdf7e29f4b0de8dc72fd08b32d775ace340da6
parent efb9987de6f1559f337fcd12517fbaaa0b570adc
author Dirk Dougherty <ddougherty@google.com> 1400105080 -0700
committer Dirk Dougherty <ddougherty@google.com> 1400105080 -0700

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

Change-Id: Ie1119bc1b18a017e1bef199949801fb045d8ff06