Fix some merge derps

Change-Id: Id9a5c09cd70f33f06da6be6917ffd51322961673