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

Change-Id: Id15ed9fe2e651647a6ab8990f82fc38f4ef05bf8