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

Change-Id: I03a722d34b452e2b311c10c7be46175cdd5553bd