[automerger skipped] Import translations. DO NOT MERGE am: 5e2cd1e3d1  -s ours
am: e1cb10d1db  -s ours

Change-Id: Ifc532325bcceb2379633bd409362de520f8e50c8