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

Change-Id: I585c6737d3811110bd519b5cc375f0219fee7927