A number of the existing API defs use static strings rather than using existing constants. This patch replaces those static strings with their respective constants where applicable. Change-Id: I505f10b58a454bd7c90725abbc62cc8a7fd46d94