am 210228a0: Merge "Start tracking added users with serial numbers." into mnc-dev

* commit '210228a089cd215bc671b9fb664d869d2c5ad986':
  Start tracking added users with serial numbers.