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

Change-Id: Ie2d511ca5a2e1112294e72920531d61233ec2983