[DO NOT MERGE] Adds basic smart-folder logging. am: ed538e53b0

Change-Id: I9f9afee40f6a4c269e236377e3aba3476940012e