[automerger skipped] Import translations. DO NOT MERGE am: 13fb4eb087 -s ours
am: 87b243e99f -s ours
am skip reason: subject contains skip directive

Change-Id: I638c8058c627ac9eb48448d4dae62a89ea6550a1