[automerger skipped] Import translations. DO NOT MERGE am: 18183ad552 -s ours am: 89f71578fc -s ours
am: bc86400e94 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie6f37961134fe151a7992ccf29e652f4b689bd6d