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