Use locale language instead of harcoded langauge
am: 7dafd0d7e9

Change-Id: I80b8154af4818e641182598a82bce68a99b7fdf4