Merge "Revert "Workaround alloc-dealloc-mismatch error on ASan device boot.""