Merge \"Add Valgrind target tests\"
am: ca7399a1d7

Change-Id: I4d9f63177976c64c2dc7adad5ee30bf41ffa4fe9