Merge "init: handle process actions when waiting for exec services" am: db8881b769 am: e503a21b0e

Change-Id: I90b873642bc6008d15901e4d5b561a111173c435