Use constants

Change-Id: I1ae3fa278aa8872a8b967c19a06d0e8813839e26