Merge "DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change" into nyc-dev am: c60f995ae9 am: 6df90df83c am: 07682b728d
am: d427158c08

Change-Id: Ic94b019618bda92ba747430544ad433ab789e931