[automerger skipped] Import translations. DO NOT MERGE
am: 035560ea01  -s ours

Change-Id: I0fb47be471b5da6a0cd81ad9cc1aa6224ca0be9d