moved to default Template

Change-Id: I6671a235fd0edb796ea4ff331091ef68d7225b5e