Merge "DO NOT MERGE Dummy StatsLog class"
am: 84bda3a709  -s ours

Change-Id: If6a663dc3b9abe19a2cfb18ab5688b401bd2f624