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