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

Change-Id: Iddb6db939af2c7fafe6623e677974bd4ad94a54d