am 21f0777c: am c192c649: Merge "Fix serial number assignment for new user on...
am 21f0777c: am c192c649: Merge "Fix serial number assignment for new user on a freshly wiped device" into jb-mr1-dev
* commit '21f0777c':
Fix serial number assignment for new user on a freshly wiped device