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

Change-Id: Ib98c1a377ed4fcdfae79e678cf512d20153a53a6