Merge "fix(cpufeat): resolve build errors due to compiler optimization" into integration