Merge "Update CachingWidgetPreviewLoaderTest members to be non-static. These classes are stubbed by roboelectric so they cannot be static" into sc-dev