Merge "[Settings] Refactor for performance" into rvc-dev am: cdab906c45 am: 0c7bad635f am: ddaf65a3ae am: 68a37b0eeb am: 1b60de86f3
Change-Id: I0436e147c7f5f980992b5044784373fdbf18452c
This commit is contained in: