Add back files that didn't get pushed the first time
for some odd reason.

Change-Id: I6dd0e1be8301a9b61f4e177911d005305febbd02