am 62fe78b6: Merge "Fix memory leak" into lmp-mr1-dev

* commit '62fe78b66c87339a64f047561e7b4aac606310e2':
  Fix memory leak