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

Change-Id: Ia649723ad4a067b41efa5d9182d21beb24ea8276