[automerger skipped] Import translations. DO NOT MERGE skipped: cbc81e618d skipped: 693ad9800b am: cb1a10f5b6  -s ours am: d996012ef5  -s ours
am: 97ee183747  -s ours

Change-Id: I606378e5028548c5189a9fe554a868512112578c