[automerger skipped] [DO NOT MERGE] Adds basic smart-folder logging. am: ed538e53b0 -s ours am: 9e270a4daf am: c81d9e4980 am: e8ca822cfd

Change-Id: I679d8c646c077bca5858533c0c0e7bb148dd21d5