Go back to slim manifest and add a few cherry-picks
Just added a few new cherrypicks and a manifest change.