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