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

Change-Id: I9f222ff611ec4a4525557bb9464b18bda7eb75f1