Gardening after Merge commit '8c217808f2c4275a555c6ec16a4dd389535e8425'.
Re-enabled INDEXED_DATABASE after r135344.
Skipping and rebasing other failing tests.