Merge changes from topic "snapshot_fuzz" am: fa8bf5be4e

Change-Id: I2f6758bd5878edc26a428a48ce16193a637dba60