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

Change-Id: I5c39024cb8a42dbf2f6333c358edf163125a55bc