Merge "Make sure to update oom-adjustment when a service starts." into oc-dev