Merge "Add tests for snapshot-deletion (2/n)" into rvc-dev am: be052c6abe am: ffff3f1ca8 am: ec90b43a81

Change-Id: I2269af3cd3db86c17dfd3f4ae8df9fb753c89863