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

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