[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 55144fc555 -s ours
am skip reason: subject contains skip directive

Change-Id: I2bf756bb5eb88628b3c79a84d70c8dd54ae9b91d