Merge "Fixed adb crash due to accessing freed memory"