Merge recent changes to settings from master

Change-Id: Ib014ef515e324d95a058e9bb9d5ee16a3e3a7dd0