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

Change-Id: Ibc3e1feaefa084d480688106eb3cc0b2dd44e766