Merge "Fix Sonar Bugs NullPointers"