Merge "Revert "Blacklist tests failing on valgrind."" am: 6db9a6c240 am: 6ff0482703
am: 23296112ef

Change-Id: I93f9acb584fb9df69715c75b5ce802b22300678a