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

Change-Id: I02f2891005df5b401a681c63ca94b703f55468b9