Fix build problem in the --disable-database-connectivity case

Change-Id: Ifcd5055656ec62b202bf4574a2fd0f7d35982090