Merge "Do not write if apply() did not change the file. am: ea10cc0fbb" into nyc-mr2-dev-plus-aosp
am: c20a6d99c5

Change-Id: I80708c12d7e8d5f805d52afe8b3eedc8a88d10ec