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

Change-Id: Iec8ead60859a0b9b8846c0a16aee84d22c5db102