Merge pull request #7684 from daverodgman/armclang-fix-2.28

2.28 backport - Fix armclang compile fail