[automerger skipped] Import translations. DO NOT MERGE am: 935509aa3d  -s ours
am: fe385f4a14  -s ours

Change-Id: I0ef2cfa586b4f2ac083de597c1a2770e4e7d4715