Bug:#1381980 Untagging the tagged packets to vhost0 as packets destined to vhost0 need to be untagged

Change-Id: Icfee506610bff6b35c86648e441bc1434a40e957
Bug:#1382951 Verifying the prefix size and prefix family before adding the inet4 and inet6

Change-Id: I4ace4aa38556b7bb307e46cf22c53a3ff8de1a15
Merge "Bug:#1382951 Verifying the prefix size and prefix family before adding the inet4 and inet6"
merge from mainline