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

Change-Id: I6bb9eeeb1c1b75f4901a436ace5c95e70cbebeb7