Replace a couple of files that inadvertently got left out

Change-Id: I1fafcc51f1c0c80436a026bb99e5fe3c827ec3a1