am baa1b696: (-s ours) am e300b8c1: Merge "DO NOT MERGE Always set/remove default routes." into gingerbread

Merge commit 'baa1b6969765cf791158b458a5f94e4278526970'

* commit 'baa1b6969765cf791158b458a5f94e4278526970':
  DO NOT MERGE Always set/remove default routes.