client: fix meta1 timeouts and a memory leak

(cherry picked from commit ae76a1a336077318a255eb1f54794a6edd0322ee)

Change-Id: I1b3e069bfca183b186b42a36002f71a8f2f9f558