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

Change-Id: I929e0a2363ff261c59a4576dd3cf9641d7d7cf50