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

Change-Id: I431dd3f3d3c535610ef2d5f48bd8543a4dc92066