Merge pull request #1282 from robertovargas-arm/misra-changes

Misra changes