Merge "Prevent onboarding counters from overflow." into pi-dev
am: 0ce1cc626b

Change-Id: I187b0d39be0535d108d3a17151aa5ae1314fdaeb