Merge "ART: Fix fieldnull tidy warning"
am: e080222ba6

Change-Id: Ia1124d5c916a96507593b18a73e89af0cca19e83