Merge "Remove "template" keyword from non-templated calls."
am: 9f9372bcc1

Change-Id: I0048ea15b8cb949261902a198091fb674ef30d8c