Merge "Merge "Moving check for empty snapshots earlier." into oc-dr1-dev am: 161d65640e" into oc-dr1-dev-plus-aosp
am: 509bfe5fb5

Change-Id: Ie15a7478b9a56dab9bbcb91a3b01af7f55008101