Merge "Blacklist primitive wrapper class value fields for Q and above"