Merge "Fix CTS test failure under ART"