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

merged from goog/mirror-m-wireless-internal-release
335b59f am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-dev automerge: 4322c8d