extract constants

Change-Id: Ifefac0ce2416497dd3fa23e3acf1642794a64656