Merge "Fix all blocker sonar issues and some checkstyle"