Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev