Merge "Don't create recovery snapshot until it contains at least one key." into pi-dev
am: 8d1ff46dfc

Change-Id: I9482195d01d157b7819674e18c04288ef3a8d3dc