Modified configuration.

Change-Id: I79aa7e64c0b7402be27e070950b68afc1a189f81