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

Change-Id: I76ca207614a29a901aed937df484d06ed1470f05