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

Change-Id: I7a9474a95dcbc898d43032cdc60153366aced241