Merge "Make kernel / init enforcing"