Adding back accidentally removed constants

Change-Id: Ib99000da8f31437e7d40eceb69779a0f4c2982e1
2 files changed