Fix two asan failures

Change-Id: I57865e9604ac162ef0d97deb16e81ca436a98428
2 files changed