Merge "[findBugs] Fix NP_LOAD_OF_KNOWN_NULL_VALUE"