More GSUP and L3 Templates

Change-Id: I0e9136fc3b8f171934f054ec149d8dd344faa034
2 files changed