Update for ASan cherry-pick.

Change-Id: I311982d33c7ace7c9f10196e9f33faba3e5b41c4
1 file changed