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

Change-Id: I9a31e2178329fca6bce2a98aaa14bc6aef69d1ab