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

Change-Id: Ic7e1612ccf2bef010ff52ce5fcfaed947f53588f