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

Change-Id: I2999208487c2c15d7e158e690cf7a2ac4e7c3e6d