[Settings] Crash avoidance am: 017cc4e48f am: 0f35750434 am: cd3cb6120c am: 5b39630476 am: 3ce173a5fe
Change-Id: I876710028889b651af44ed211d54827c59da2327
This commit is contained in: