Merge "Modify the default values to avoid 2 DB hysteresis DB limitation" into rvc-dev am: 95ff60f2fd am: 39ba45aee1

Change-Id: Iead5e18b3ecabbd6e50d7c0d1516935dfd9da19c