Merge "Fix serial number assignment for new user on a freshly wiped device" into jb-mr1-dev