Merge "Remove more "template" keywords from calls that aren't templated."
am: a9a0e14786

Change-Id: Ib55a9ef4155ce53c651d7c0549a44ead7f5e6650