Merge "Fix comparison of device source bits." into jb-dev