Fix merge derps

Change-Id: I98391756a449c509fa95d0811f8fef4606af5035
Fix more merge derps

Change-Id: Ia30e4ac3ddc565c0cadf900afae9b877f89328a1