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

Change-Id: I826650a0fad6d2c8a01d6da3781fae5c129e5588