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