Merge "Fixing potential null assignment to primitive value."