valgrind: Conditional jump or move depends on uninitialised value

Change-Id: I1939d376afe5dd5c67f378ffb2520a066dc99077