[automerger skipped] Import translations. DO NOT MERGE
am: 942cf4962a -s ours
am skip reason: subject contains skip directive

Change-Id: Ibb8838ca1ce77ba6460702a935b4a12ae5b79bcc