Add ID string to file, remove unused/undocumented -template option

Change-Id: Ie6445fce9f9cd9a4e6a63c6d360e78764a4dbd62
Merge "Add ID string to file, remove unused/undocumented -template option"