Merge "Move the template out of extern "C"."
am: dea312bf14

Change-Id: Ie811b58cc616359c2ecec6ecb140528dd07f1d42