Merge "Fix duplicate gps.conf for Flo/Deb"
am: d5810f1a3a

* commit 'd5810f1a3a8df3b15b41dba50da63bbdfc9ff263':
  Fix duplicate gps.conf for Flo/Deb