Merge "Fix data source for HEIF exif extractor"
am: 31bbb473ce

Change-Id: I36367e758da6050db78ed9b6c96757a97a15529e