Settings changes

Bug: 8685202
Change-Id: Ieaea840c61b7aca22ae664a66dbc0a28643e7139
13 files changed