[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 4d1067b315 -s ours am: 530d5efed9 -s ours
am skip reason: subject contains skip directive

Change-Id: I5de75be02cde7a42545e91bc8ce77bd75b68069c