f96433b030
These templates are not specific to Ubuntu, so should not be in that file. Change-Id: I4df08599a9075852d3fbf1187ca0b89d59893520