Merge "Fix error reporting in cp_commitChanges" am: 2a683d4ce6
am: b0b31d360d

Change-Id: I71ba57abf41afaae7b9f08ed4490fb2c08b5dfe4