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

Change-Id: Ifd2aa5679f1ee374072b951a5f5539d9289c9cd7