Removes duplicate yaml and updates yaml with OS header.
am: 7b99da86e5

Change-Id: I8f1c6ad6ba254ac2fc630fcead0d677a79ffbef0