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

Change-Id: Id7aacd0a85ab04fcd0493824dd7b8c6fea1ef6b3