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

Change-Id: I9b5372e5804af3e6b36a45600eaae8e038c268ba