Add missing files, previous commit derp

Change-Id: I4bde093ed087b1c8cd07185b2c9f07c42a8e780d