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

Change-Id: Ia5f443d3afd5370533d11cdd21e54aa260f4eb2a