[Settings] Crash avoidance am: 017cc4e48f
am: 2e5af24106
am: 9835acb2e2
am: 66e2d57e49
Change-Id: Ie7ae49d27d65b196b5a228da1455712c9548acef
This commit is contained in: