Merge "Ignore keepalive tests before S and without Tethering module"