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

am skip reason: subject contains skip directive

Change-Id: I8a8107be57f41b6b6e04e0b28fae7d47d3a8ac38