Be more tolerant about last locale name. am: a3249f39bf
am: 6434448e05

Change-Id: I74f5364b721f1b90fc863f726b43581a622d17a0