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

Change-Id: I52c3563ae8e8e74b6a2b5d0863f45a7883efe255