[automerger skipped] Import translations. DO NOT MERGE
am: 3a1cd52583  -s ours

Change-Id: If23d0c4730b474a8ecddae3ed886c1134d73dbb5