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