Be more tolerant about last locale name.
am: a3249f39bf

Change-Id: I01af1521f3f408e832115cfed499a4aff1d6ef30