am 897b8838: Merge "Handle error condition when inserting snapshots" into ics-mr1

* commit '897b8838bb59fa89226a4b72e27571eefe43ca60':
  Handle error condition when inserting snapshots