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

Change-Id: I9ecb0c88a6ecd0b7feb5bcfbfa815b4da71a1df4