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

Change-Id: I9317e801555dd50cf63fcf182e46a0034cfdb2f9