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

Change-Id: Ia4ed9fe95c96b9f4ed30df314e7234d4e79e6e04