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

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