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

Change-Id: If9c7cb8645ca52d0850080c0d071cd4959553be2