Merge changes Ifc76203e,I194d15cf

* changes:
  libsnapshot: Fix DataWipeRollbackInRecovery test
  libsnapshot: Fix test MergeInRecovery