Merge changes Idbfec4ff,I135f561a

* changes:
  Add backup data round trip test
  Import EncryptedFull???Task