am b8b32310: am c1b829b8: Merge "Remove ActAsNullConstant"

* commit 'b8b32310e9accb6bd03c4ae1971330e686998829':
  Remove ActAsNullConstant