Merge "Fix ASAN gtest"
am: 53b162a478

Change-Id: I22f1ec22bec9cba2cf310cdcb87e55c71f175c19