Merge \"Workaround alloc-dealloc-mismatch error on ASan device boot.\"
am: 7d8f246415

Change-Id: Ic34e6263619b98739f935e0aa05bf50aa7399829