Merge "Remove Jack Bond-Preston as CMake Build Definitions code owner" into integration