valgrind: Conditional jump or move depends on uninitialised value

Change-Id: Ia0b22f7c394d1c2387d1cad7e3d99c79eaeca81a