valgrind: Conditional jump or move depends on uninitialised value

Change-Id: I1939d376afe5dd5c67f378ffb2520a066dc99077
(cherry picked from commit 6efbc4598aea1e87c1569c7beef13d44b1a4202c)
(cherry picked from commit 1742008dd0d83f3e69b6e09d9e3223d0c5d28096)