am 0f83a009: Merge "Use defines for current process creation."

* commit '0f83a009695513627dfdc5ef383a2984192238f6':
  Use defines for current process creation.