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

Change-Id: Ic93a50eb1f3d18ea241190fb773c600a2e1ac2eb