Fixed one typo and removed one TODO comment

Change-Id: I941c308873562a5dec13277959abb7b7fd412b83