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

Change-Id: I4b66bd86ad4e12f743eefebf9b25e0f7115829fc