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

Change-Id: I2d653a77b670af9953654a488c0078a597d32e39