Merge "Make requestRouteToHost a no-op for system callers."
am: f1bcfb6014

Change-Id: I37ba2ef7ee7d052ec47c2d314f165315a13b06ac