[automerger skipped] Import translations. DO NOT MERGE am: 17af9260f8 -s ours am: 682ad3a62c -s ours

am skip reason: subject contains skip directive

Change-Id: Ied09c7719271921d1d104fcfeacba1dedf963dc5