am 6985f5c0: am 43cbb6d1: Fix templates files overwriting sample files

* commit '6985f5c0fa3d580628649001e6b8a31c5505eb74':
  Fix templates files overwriting sample files