Merge "Fix broken test RecoverySnapshotStorageTest" into pi-dev
am: 7dd666f4c5

Change-Id: I7380c5f676f40fead709bc237e59b5eff73ab53b