Android n mr1 preview 1
Merge "Fix counter ordering"