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

Change-Id: I26f20f98665d1db250cf90122510acaab760f912