Merge "Fix major sonar issues in SDK APP"