Merge "Fix CtsSyncAccountAccessOtherCertTestCases failure."