Merge "Limit device name length" into jb-mr2-dev