fix build errors

Change-Id: I350fd677ed16a09004298ae55071210777c8b12c
derp

Change-Id: Iffd17e54f6e74e55e79ce7caf427a404249a4b58