Fixed some sonar warnings.

Change-Id: I6eb8668cfa18e745d4db1d70ede65cb76ce34238
Signed-off-by: Shigeru Yasuda <s-yasuda@da.jp.nec.com>
Merge "Fixed some sonar warnings."