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

Change-Id: I0d5913d4a97812c8342e4417ccbab04fa8bacb70