[automerger skipped] Import translations. DO NOT MERGE
am: 65f4e7a7c7  -s ours

Change-Id: I1a57a25519abb1a2dcfaac9a762a3265391c104e