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

Change-Id: Ide329f8e32538f4643e727697b35bfc2b7007f57