Add FolderInfo label source / Add instance id to snapshot logging

Bug: 155719741
Change-Id: I6611d67bc7a940b6e7cf80ec788406c9f2499318
3 files changed