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

Change-Id: Ia4f907dfc7d3ad2f04d3a61d43b6c6ba4c78930e