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