Merge "Fixes possible NPE when settings are missing" am: a58e303c0f

Change-Id: Ieb8943f87f32600132c80a9c840ec79c059bb71c