am da8beef5: am 37229514: Merge "resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp" into gingerbread-plus-aosp

* commit 'da8beef55612738d87d6aa520445377a9e4ae784':
  Fix Default route after secondary net use.