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

Change-Id: I6f499812eb59c1ef90a3d02110e38619839d390e