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

Change-Id: I33103967b14170e93eedb44595c86f26a52269ea