Merge "Fix issue #7290206: Need API to get/look up user serial number" into jb-mr1-dev