Merge "Fix counter ordering" am: 61575af334
am: ae23987838

Change-Id: I39aedceda3ded5ac263e2e8cb677e9aa51da4db8