am c1b829b8: Merge "Remove ActAsNullConstant"

* commit 'c1b829b8d52affb1b6789550d2ffcc6689389209':
  Remove ActAsNullConstant