[automerger skipped] Import translations. DO NOT MERGE am: d4e7fd3ed1 -s ours am: 893989a6a2 -s ours
am: aeb3ea998e -s ours
am skip reason: subject contains skip directive

Change-Id: Ifa62709447c0fd208ffb67b2c5d8bdbe6bfaa245