Merge "Fix template support." am: 96e15c9e7d
am: 5afe782a9c

Change-Id: I1ee7ab0948f5f70a62e2cbde0745e7d9e2a06657