Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0 am: d5cf3b0a5e am: 90cd472a7e am: 9d5fa99a60 am: 0127654666
Change-Id: I1579b1ec5a9ac777676ba2ff4a0cce8f33d79eda
This commit is contained in: