Merge "Fix loading of large IMEs" into udc-dev