Merge "Fix UAF error caught by asan" am: 4df8ee17ed
am: f301315cf1

Change-Id: Id8de878d762c4b0a0c1ff1856483da1384bcc0d8