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

Change-Id: Ibffc165f22ab88e26c2a03eb3d6737b9e2233f54