am c3ff95c4: am af811bb2: Merge "Increase max number of EXIF tags." into jb-mr1-dev

* commit 'c3ff95c44b6f649e9f177a16bdf1f306853278b4':
  Increase max number of EXIF tags.