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

Change-Id: I95de88756d3a50478a74f2d55acb2e4260fd626d