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

Change-Id: Ia2241da1274d0436eb8eafc70addd55f8d99c45b