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