Merge "Handle error condition when inserting snapshots" into ics-mr1