Merge changes from topic "libsnapshot_flash"
am: 50e102c51d

Change-Id: I044aabb217f58b1edfe58c04a92a294da0939508