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

Merge commit '993f85f3194000d0eb212f361431c9319548b144'

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