Updating a few files that were from older versions of the template system, or weren't added at all.

Change-Id: I798712bdd773d43d1f5f1a885d3b18b6b49e07e3
3 files changed