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

Change-Id: I3a6fe7660b8cd24c8069820a7a738a084fe896ae