Be more tolerant about last locale name.
am: 82d33ed376

Change-Id: Iee076e17731b9c16acea277fc869170829fbf18d