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

Change-Id: Ib6e32651f0a24462485d8671f9122af297fcb5ba