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

Change-Id: I5f223c94f436e33c74272f0364e11697f3b7838e