Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into nyc-dev