More config changes for grizzly

Change-Id: I2fb56c80a3fa6505439af26561f45ae9966e346e