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

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