[automerger skipped] Import translations. DO NOT MERGE am: 75f11f429a  -s ours
am: 9a18f1f6cd  -s ours

Change-Id: Ic449b18b08e478c37a0b0476be3ffd7491765c3d