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

Change-Id: I405551c2b4b7272c3c7d65079fbfbd18c33574fd