[automerger skipped] Merge "libsnapshot: fix incorrect assumption of cow...
[automerger skipped] Merge "libsnapshot: fix incorrect assumption of cow images" into rvc-dev am: 8601d372 -s ours am: f7924aaa -s ours
am skip reason: Change-Id I1ec39744480e514ae7a7902643ed863e0ca0a340 with SHA-1 82035d6b is in history
Change-Id: I10111c3059a7b713fcf40ad4350f9226e7b1d299