Merge "Don't initialize ProcessState unless we need to."
am: 5f7692f5b2

Change-Id: Ib6fdd0276f7469adb8b2017e90ccf067ce2ed945