MERGE COMPLETE. Fixed compile and test runs.
Merge branch 'sw-content-api-crbug360202-onLKGR-' into sw-dispatch-crbug357239-on360202-