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

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