Merge "Add tests for snapshot-deletion (2/n)" into rvc-dev am: be052c6abe am: 553fdee39d am: 20f9e0f7c3

Change-Id: I24db6d24dd0c4f2ea204423bf40007ded248fa05