am 07116b12: am 2c89b4b3: am dc4a88f7: Merge "Further fix on issue #16013164" into lmp-dev

* commit '07116b128e16169c990d973d3fafed3a9200a26e':
  Further fix on issue #16013164