- Fix clang build - Convert to Options NG PR: 176650 Submitted by: William Grzybowski <william88@gmail.com>