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

Change-Id: I9979a3422b5926a7e210ded393484f6eb28e8600