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

Change-Id: I91a49443a2363a06213cb55c0635c0fdb7abde9c