Merge "Re-enable libsnapshot ImageManagerTest"