[automerger skipped] Import translations. DO NOT MERGE
am: 2ff803e2a3  -s ours

Change-Id: I3da270d8b7e15a5797483b724227de07cb1cf2fe