Merge "ExifInterface: keep tags in the original tag groups" into nyc-dev