Merge "libsnapshot_test runs as root" am: 30abf7a9fc am: 4eb7ba464e

Change-Id: I953ef4987e9881ae73eac5790c84a54a97f730d8