Merge \"Add tron logging for retail demo session counters\" into nyc-mr1-dev
am: 30a2b43f6d

Change-Id: Iaca49cc4aad9285e87d869b112b6c2986073f006