Adding non-recursive template extraciton and localization

Change-Id: Iae7bf691cf17b673e4be240a9ba9d9f2483b8234