Merge "[Settings] Code refactor for data usage" into rvc-dev am: abdeadf85d am: 148972e154 am: d84e25071c am: f4403d4a7b
Change-Id: I91603a742f71d4c6aeabc15677ea0534230e0a3e
This commit is contained in: