Fix some derps from merge

Change-Id: I6fa3e720738db5f3fb08fa2f60276d496ecd4f6b