This does not override anything

Change-Id: I54a585caee19c063b587a1f8f0c07913de2c3cf7
Fix some merge build derps

Change-Id: I0b2dd77e4841a21b5933ad4815fd606f68523a44