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

Change-Id: Ieb3324dddabe3f7419de991c4cb546e3ae5653a1