Merge "Remove valgrind workarounds."
am: 79d8ecb9fb

Change-Id: Ib9bcddb661a1d555d8a4336072deeadd8078d651