Merge "Fix flaky RoR test when running on cloud devices"