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