Merge changes from topic "snapshot_fuzz" am: f4cd49afa4

Change-Id: I61de76f189473c0d56f4b4d7a0c79935fa098c54