Merge "Add a hidden flag to indicate exif data block." into pi-dev
am: 23fdce9295

Change-Id: Ifd2f6ca586d2e42c73b8f9a30c5db1b9cc644bbf