[automerger skipped] Import translations. DO NOT MERGE skipped: e34cac0486 skipped: a14fb25f93 am: 19f08130b1  -s ours
am: fa70de88c5  -s ours

Change-Id: Iab847c723ba9b240967d759276c06c9643955ea6