am 3fb884d5: Merge "Cleanup allocation constructor"

* commit '3fb884d5443001231fbc6f15ddc4aad610fd4f16':
  Cleanup allocation constructor