Create change-file

Change-Id: Ib640426c9a16f06c41c96e5316570c4bf7041cd2
Merge branch 'amend1'

Conflicts:
	change-file (resolved)

Change-Id: Ia0bcf3291fae946a0abe9dda1f6d199b382a3fa9