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