Add ID string to file, update (C) string, shorten output line

Change-Id: Ibacef9e3ee75d8b30174230f4a59588420b57848
Merge "Add ID string to file, update (C) string, shorten output line"