Merge "Fix temporary file name strlcpy size."
am: d4d542e0ca

Change-Id: Id9de2553e39a1999ed7e43c3ce5bc18b63fc2221