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

Change-Id: Idf8bcb5ca7cd4ba3f33190cd7c0dbd5bd70430be