Merge "Pipe through device resolution information" into jb-mr2-dev