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