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

Change-Id: If05a618e489d85f0d325573806cff90150515b31