Merge "Skip the cert xml serial number check if the test root cert is in use" into pi-dev