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

Change-Id: I76e29f42d3167d5c3f3913797d765554930ac528