Merge changes from topic "always-on-vpn" am: cc15c7f8c1 am: 692b55390f am: 01014743c0
am: 551fb6ba84

Change-Id: Id3ac9d9e2a982e9205f4f4a70c1373eed6480844