Adapt to API constant changes

- Affects b/10461474

Change-Id: I08bf5e1bd389428233638b1a19ec06a10393380f
6 files changed