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

Change-Id: Iab27248de2978e08fd3d901e1d54d77af21ec67a