Merge "Work on issue #16683269: system_server still leaking memory" into lmp-dev