[automerger skipped] Import translations. DO NOT MERGE
am: eb915a80c9 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibfa1da208cad2436780a7f76e2249b398631c597