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

* commit 'bcced5b834e49bf3a0b57a0009958ba061d31e76':
  Fix incorrect condition for sub id check.