Change configuration

Change-Id: I76f1b0452cc82d0fd728ff3a0105155022c6ce76