[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 85288a5e3c -s ours
am: 54d5947793 -s ours
am skip reason: subject contains skip directive

Change-Id: I8e524ba33fe382b607d9cb40e0cb66c6054b35b0