Merge "Remove valgrind workarounds." am: 79d8ecb9fb am: 2d49cdc7ec
am: ff7389bff3

Change-Id: Iea8fd5467530a1bbe92c7c1f718fc3929efea156