Merge "Add v4/v6 route add/removal support" into honeycomb-LTE