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

Change-Id: I5c5948b755073dd261c8887d6ef6399dfc837faf