Merge "Ignore NullConstants when computing the type for Phis." am: a663d67500
am: 043851a8c0

* commit '043851a8c0f3ffea22cf97f0697df641f74af89e':
  Ignore NullConstants when computing the type for Phis.