Re-sync with upstream and stripping away none kernel related.