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

Change-Id: Id7e6141c84b73c5a3c28ae5d2eb003c49847efcf