[552027] Sonar and API Tools warning fixesChange-Id: I42fd8bb061936795ef70805b31b6503c3132e526 Signed-off-by:Zoltan Ujhelyi <zoltan.ujhelyi@incquerylabs.com>