Fixed typos into constants

Change-Id: If838119179c02c0d15e96bee8d941fa8aca0534d
Merge "Fixed typos into constants"