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

Change-Id: If6efd949c11a39c4df2ed753c6b850785f8872e4