Merge "Skip data saver related tests if the device doesn't support it." into oc-dev