[automerger skipped] Import translations. DO NOT MERGE
am: 08dfafa777  -s ours

Change-Id: Iecf6b9b22d68f5d22b6ac061f97315797974aea2