Merge changes from topic "libsnapshot_prep" am: 233c32a454
am: 02c2eca24a

Change-Id: Iad7ebe330c636f29afb076285fe4a396db2bd987