Blueprint: sahara-create-default-templates

Change-Id: I1e206965ebc13ee535e695c1e137340b60dcd42e
Merge "Blueprint: sahara-create-default-templates"