[automerger skipped] Merge "Modify the default values to avoid 2 DB hysteresis DB limitation" am: a059affff3 am: 9e80bca139 -s ours

am skip reason: Change-Id Ic1af774b28629c7ab0e105f6ce198bfce8d160a8 with SHA-1 66c51cda97 is in history

Change-Id: I13986af6ee2862663301cf167d0bb90d17f86a79