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

am skip reason: subject contains skip directive

Change-Id: I75143a0693eed5d8d40ce3e10acf96ff68017f7a