Update local repo sources.
Local changes. Cherry-picks not longer needed.