Merge "ART: Fix fieldnull tidy warning"