Fixes and changes to support settings using UsageView

Bug: 27213136
Change-Id: I1796d710379fc92cf21b196459f34dda4570355f
7 files changed