Merge "Modify the default values to avoid 2 DB hysteresis DB limitation" am: a059affff3

Change-Id: I2b7a90343be8d2e3b69d78dae9890ba28f01939f