Merge "fixed sonar issues in SvcLogicServiceImpl.java"