Merge "Start tracking added users with serial numbers." into mnc-dev