am bde54203: am b8b32310: am c1b829b8: Merge "Remove ActAsNullConstant"

* commit 'bde542036a1ecfa5f0b06de20b595f7a046fef4e':
  Remove ActAsNullConstant