Merge "Update settings"
am: 6125ea192e

Change-Id: Ie1b92f1d824384178faeb8f14554bacf2fe188a8