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

Change-Id: I3ab8fe29216e2575161c79aab6b4ad3ab22cf650