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

Change-Id: I001e73e19617c81ffc2056846a6de3c5384ad411