Add ID and/or licence information

Change-Id: Ibf2e315622078742070ddea8edd9ef49519426a6
Merge "Add ID and/or licence information"