Merge "Enable kernel UID state updates."