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

Change-Id: If2dd70cd292b322d76f69fdeb1771035402eb72a