[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
am: b0477d077b  -s ours

Change-Id: Ieb635b86f9a2d37e67414a9b2881d6cbe665d89b