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

Change-Id: I2a5e86721b5dd2b14421bb4c4490a94402ca5d75