Update constant capitalization

Change-Id: I07fc68640c2dcc30b313aa1da8da1b82513876ff
Merge "Update constant capitalization"