Merge pull request #1651 from antonio-nino-diaz-arm/an/rand-misra

Fix some MISRA defects