[automerger skipped] Use locale language instead of harcoded langauge am: 7dafd0d7e9 am: 6b5eca5b68  -s ours
am: e30d6920ab  -s ours

Change-Id: If70a9d720f52e17bf27f33973868d9aa0e154b32