Adding temlates and tiny change for Queens release

Change-Id: Ie51d0addd389b3ce897413b2c2b3f8a7e43c2e8e
12 files changed