extract constants

Change-Id: Ifaa594a01b568517984d6bc4aea6d65b67056555