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

Change-Id: Ice015a9f71163d0329bc1d1f77d125c22a7b9222