Merge "resourceloader: Disable flaky test ResourceLoaderModule::getVersionHash"