Merge "Skip unreachable route when estimating VPN destinations" am: 21078b1edd
am: e000de90f4

Change-Id: Ia9301b3bf52b42a742f1f6b3a02499a1404ed3f1