Fix inconsistencies in utf16le templates
Fix inconsistencies in utf16le templates

Change-Id: Ic9bf60edc23fea926fee542f4c7c34119d4ddc9d

flabbergast-config/flabbergast,flabbergast-config/flabbergast,flabbergast-config/flabbergast,flabbergast-config/flabbergast,apmasell/flabbergast,apmasell/flabbergast,apmasell/flabbergast,apmasell/flabbergast,apmasell/flabbergast,apmasell/flabbergast,flabbergast-config/flabbergast