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

Change-Id: I64c122dbf2b02d553b7ca997c3c0a5ac61d2d6ad