am cdee9727: Merge "Make isHostRoute match only host routes" into jb-mr2-dev am: faac152a2d

Original change: undetermined

Change-Id: Ia5a61337c20f52ea5e0cd2b20cb52a87f74b971c