Merge "Handle new device api version encoding" into jb-mr1-dev