am aaddfacf: am bdb706e4: Merge "Pipe through device resolution information" into jb-mr2-dev

* commit 'aaddfacf962655d82f3ad64723ea408f949a2b79':
  Pipe through device resolution information