Trying ti fix sonar issue

Change-Id: I987b81cf35fceb428cd4c1a4239d687813c97e34
Signed-off-by: Reinaldo Penno <rapenno@gmail.com>