Merge changes from topic "libsnapshot_prep"
am: 233c32a454

Change-Id: I5d5398bcd36d8aebf5ec10ed2d1fef226c8f6895