bug1274266 and 1353058 fix commit/rollback issues

Change-Id: I4a976b4c112462206d10b85bb41d45b6dc062044
Merge "bug1274266 and 1353058 fix commit/rollback issues"