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

Change-Id: I1070516f426786de542fea8d54a1f6433ecdceae