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

Change-Id: I10bc7897683423d4f077bf4cad7fd473ad334e07