Software templates fixed.

Change-Id: Ia3e1f65c46b1f4d3598cb8ac2a115de713a51bff