[automerger skipped] Merge "Fix various thread and memory leaks" am:...
[automerger skipped] Merge "Fix various thread and memory leaks" am: 80b20580 am: 807bcde0 -s ours
am skip reason: Change-Id I89cae577965db9d912a979627bcd8175159d7d72 with SHA-1 4fdcab49 is in history
Change-Id: Id865b78575734c7e84515a671359013cd3df0c39