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

Change-Id: I65bf2958c165bbd4704ce9b614b675af39b21a56