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

* commit '072a0fac3cabd50c2089d987b5abceac35c74570':
  Fixed adb crash due to accessing freed memory