Merge "Fix spotbugs issues in common module"