am 0394c8bc: am c39f4fc2: am 5a9cfe3e: Merge "Maybe fix issue #17614177 APR: system process restarting due to infinite loop" into lmp-dev

* commit '0394c8bc98d76261881595efd7e6b3528e0637af':
  Maybe fix issue #17614177 APR: system process restarting due to infinite loop