Merge "Improve coverage for DelegatingContentLimitingAdapter to 70%" into sc-dev