Fixing configuration file usage.

Change-Id: Ie9b7d126ba574a59922e59687c65fb0c6fd27763