Reduce sonar warnings.

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