Merge changes from topic "libsnapshot_flash" am: 50e102c51d
am: a0c8b87080

Change-Id: I5b0e115b78343a0e0fe007b46a75deb1a2913b17