am 619c7fab: am eafcbe10: am 072a0fac: Merge "Fixed adb crash due to accessing freed memory"

* commit '619c7fab0e7891238183020505ee9323f6b35368':
  Fixed adb crash due to accessing freed memory