Merge "[optimizing] trivial x86 explicit null check fix"