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