Eliminate spacing memory leak on client (#13315)

Change-Id: I432ae4a04d74826dd1cce108177bd503774a8463