[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 9d83a7b1a1 -s ours am: 4ade706df0 -s ours
am skip reason: subject contains skip directive

Change-Id: I42ac6f1e171c405f34ff1268b7653158924d71e2