Merge changes from topic "libsnapshot_write_atomic" am: ab0b17c081
am: 421715c72a

Change-Id: I09d22ce3ffe981177282333185ca5119557956f6