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

Change-Id: I2e05e2e099c72f1490ffd7a2dcdd249b8728cd28