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

Change-Id: I0716b16a3a474db8b849ef8d40fbca349e63f0e1