Merge "Use package name as custom resolver process name" into lmp-mr1-dev