[automerger skipped] Import translations. DO NOT MERGE am: e983b7a383 -s ours am: 2aeb885676 -s ours
am: c64375f263 -s ours
am skip reason: subject contains skip directive

Change-Id: Iab9ea9245343866689850104e0e2827e63cab0b0