Merge "Change TRON counters to reflect cl/159755374" into oc-dr1-dev