Merge "Code cleanup for vpnintent module as per comments"