Merge "Update settings" am: 6125ea192e
am: 17210bbca7

Change-Id: I7379b07905701a03a37df31c4f648501c60cc433