Fix crashes after switching languages

bug:8148068
Change-Id: Icb23c8b221e52fe26981887a0af9857f3d58bf79
2 files changed