[automerger skipped] Merge "Change the default value config to avoid 2 DB...
[automerger skipped] Merge "Change the default value config to avoid 2 DB hysteresis DB limitation" am: bdc085b0 am: def38ee6 -s ours
am skip reason: Change-Id I60fdd4ee141d8c711435a259cf71174a084ba3e4 with SHA-1 e7f2fa0c is in history
Change-Id: I6e431351052e86b215ac5a5a784e026aff444d0b