Merge changes from topic "libsnapshot_write_atomic"
am: ab0b17c081

Change-Id: I6f57f188d9e0c7f746cd0c2001bfac8d0288045b