Merge "[Settings] Refactor for performance" into rvc-dev am: cdab906c45 am: 0c7bad635f am: 9a4480d887 am: 6e7e949446 am: 049476f652
Change-Id: I46d39dc09413a0716a51183e33a537d76a74a46d
This commit is contained in: