am 4b19b7aa: Merge "Fix wrong-thread issue" into lmp-mr1-dev

* commit '4b19b7aaff1d1ff972ebe68101c2107454bbe5de':
  Fix wrong-thread issue