Merge "Fix counter ordering" am: 61575af334 am: ae23987838 am: 8117e1f149
am: 2cbbca1fe7

Change-Id: Ia29bcb7c23a553874512aa41c040b17315e1f6b1