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

Change-Id: Ie997ca2fac3a6cd8421fdae6617e016b4533486f