Merge "Remove unused std::ostringstream variable."
am: d1d24926ac

Change-Id: Idd32e74c431333a62aa4d0810856234d9d585699