Fix the issue observed in static code analysis. Change-Id: I3ec4abc3b51d3b36350e1f2d592ae59a21d8aa62 CRs-Fixed: 928208