Fixing typos and missing files

Change-Id: I038a884e9414362a09591ddcd1a03924e97f013e