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

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