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

Change-Id: I3931c053c4daff092b06e3e1d673817708762a62