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

Change-Id: Ibcbc34643516ff5dea7038a9917d2beb066483ea