Merge "Avoid loading duplicate jobs." into udc-dev-plus-aosp