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