[automerger skipped] Import translations. DO NOT MERGE
am: 4b1f78438e  -s ours

Change-Id: Ifbbf59d10d914d35a52f138b0974a2a3cf79a545