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

Change-Id: If9dce3d89afdec393b94cf619d66a5479cad5efd