Merge "diag: Use strlcpy/strlcat properly"