Merge "Fix counter ordering"
am: 61575af334

Change-Id: I0fe33f521c733f1300fbd458dd5a7af5ece00a4c