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

Change-Id: I738ce2d550f997af90e46a1ed53d2ef20274d1fb