Merge changes from topic "libsnapshot_fuzzer_test" am: 1dc4e19f2a

Change-Id: Icf37d8aa5504058f964f4f1169132e82ff608b1c