Merge "Removing SECURE_KEY_GPS_MODE flag."