Switch constants to existing standard values.

Change-Id: I9196714d9fd9462034d3931282ed9dbf559a1a0d
3 files changed