Merge "Add tron logging for retail demo session counters" into nyc-mr1-dev