am 830f39ad: Merge "Fixing a memory leak: activities are leaked." into lmp-mr1-dev

* commit '830f39ad3cb2c0ff2300c7288e695def37e3b1dd':
  Fixing a memory leak: activities are leaked.