Settings changes

Bug: 8685202
Change-Id: Ica781557b91e5ed43221f6e28b9d65cbb044ea55
5 files changed