Merge "Make isHostRoute match only host routes" into jb-mr2-dev