Merge "Make DEFAULT_SYSTEM_DEV_CERTIFICATE available in keys.conf"