Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0
am: 5c6094bcf4
am: ea0934d5e5
am: db329e92d0
Change-Id: I00931d862378f8460c4a8d2b11a2d1a87c5c019a
This commit is contained in: