am e3911500: Fix 2672651 When GPS is disabled, GPS EXIF data is still in the photo http://2672651

Merge commit 'e391150007300e63d3fb6e2236db3f4c9247fb9c' into kraken

* commit 'e391150007300e63d3fb6e2236db3f4c9247fb9c':
  Fix 2672651 When GPS is disabled, GPS EXIF data is still in the photo