[automerger skipped] Import translations. DO NOT MERGE
am: 67efbc844c  -s ours

Change-Id: Ic593c6d12dd7e9450a8d606a39c5ec128fb95772