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

Change-Id: I3c4df2e5fd011952c1bd207134cf85cc8e51b847