fix(rm): Fixes for checks from analyzers
Signed-off-by: Udaya Ranga udaya.ranga@arm.com (cherry picked from commit 0496dc61f0db065110e1282d7d0fa19986f804d2)
Signed-off-by: Udaya Ranga udaya.ranga@arm.com (cherry picked from commit 0496dc61f0db065110e1282d7d0fa19986f804d2)