[automerger skipped] [DO NOT MERGE] Adds basic smart-folder logging. am: ed538e53b0 -s ours am: 9e270a4daf am: 65166f688e am: 898e80aa10 am: 3cdaba0030 am: 0c31032677 -s ours

am skip reason: subject contains skip directive

Change-Id: I3663f5cea93d9383e0899182c3aae6b1ee2f10bb