Use shared constants in old+new facilitators.

Change-Id: I18b701df6ecbcc20ff0c664c218289179c4b2b2d
3 files changed