am e300b8c1: Merge "DO NOT MERGE Always set/remove default routes." into gingerbread

Merge commit 'e300b8c10c306b575bbbec29d5572ba92a97785e' into gingerbread-plus-aosp

* commit 'e300b8c10c306b575bbbec29d5572ba92a97785e':
  DO NOT MERGE Always set/remove default routes.
tree: 63a85e6b8ec1eb9669f3cd9daa133f7d96ea6f6f
  1. core/
  2. services/