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

Change-Id: I1e0ba0f8a4abff0ecd6a7b0523693e832870f1cd