Workaround for VPN drop issue between GSI and stores on July 1st, 2017