Merge "Fix master-art-host build by removing flakey test (temporarily)"