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

Change-Id: I5b8baa53812fa991cc7fa45c64e620045f2687ca