Merge pull request #1532 from jeenu-arm/misra-fixes

MISRA fixes