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

Change-Id: I803f0759d9a8b533a84f1d62d76dda56ab8d6e22