[automerger skipped] Import translations. DO NOT MERGE skipped: f874b0912a skipped: 6edf394788 am: e51c2ecbf3  -s ours am: 0cffedbb1c  -s ours am: 233d5f005b  -s ours
am: 1950254a1e  -s ours

Change-Id: Idaa1a07855855c82bfdf646b67952c8fb4cb46ab