Merge "Partial cleanup after b/143488140" into sc-dev