[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 73f2ecbcd6 -s ours

am skip reason: subject contains skip directive

Change-Id: I3d2ffd03acff92924cefad9ce98e748921dc6a38