Merge "libsnapshot: start in background" am: fcd3b67a40 am: 5d0c6659e7

Change-Id: Ic9d355e06dbd14ea10c54fe6c7d1b5bf5a84cfe4