[automerger skipped] Import translations. DO NOT MERGE
am: 7435f64406  -s ours

Change-Id: Ia6e2f66e0647c76deddc16dda7446a2829fb965a