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

Change-Id: I14692ab188cab9bc6ea3651992ee9b7dc9f01d3d