Merge "GIC-600: Fix MISRA-2012 defects" into integration