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

Change-Id: I2d434536b2da44d91ac72626abf0b4131d2d7d5a