Merge "Fix NPE when querying serial number of a partial user."