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

Change-Id: I09e154d6bae9e10e10b972afa86a00430bda2727