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

Change-Id: I1fcf7c560e899e66f3d2813108b9960122326b88